Merge branch 'pt/am-builtin'