Merge branch 'ms/patch-id-with-overlong-line' into maint