Merge branch 'kb/am-directory'