Merge branch 'jc/builtin-am-signoff-regression-fix'