Sync with latest beyo-model-mapper