Merge branch 'sl/maint-configure-messages'