update attr mapping for current AD
Merge branch 'hotfix/1.1.0'