Merge branch 'gb/am-foreign' into next