Merge branch 'jc/merge-saner-messages' into next