Merge branch 'gb/am-foreign'