Merge branch 'ah/misc-message-fixes' into maint