new mapping entity
new mapping entity
Merge remote-tracking branch 'origin/NewMapping'
Final merge...