Merge branch 'jk/unbreak-am-h' into maint