Merge branch 'rs/mailinfo-lib' into maint