Merge branch 'pt/am-builtin' into maint