Merge branch 'dc/fmt-merge-msg-microcleanup' into maint