Merge branch 'bc/maint-am-email'