PR comment fixes
Merge branch 'feature/attribute_mapping' into feature/mapping_for_everyone