Merge branch 'jc/am-3-fallback-regression-fix' into maint