fixed ap-map potential naming conflict
Merge branch 'master' into pr/565