managing bad mappings
Merge branch 'release/bad-mappings'