Merge branch 'cc/apply-am'