Merge branch 'bc/maint-am-email' into maint