Merge branch 'ae/maint-mailinfo-rm-only-one-patch-marker'