Merge branch 'rs/mailinfo-header-cmp' into maint