Merge branch 'pt/am-foreign'