Merge branch 'jc/am-state-fix'