Check the mapped key exists before mapping
Merge branch 'dev'