Merge branch 'ns/am-to-empty'