Merge branch 'pr-174-rework-model-mapWith'