Repository.mapObject broke after merge with revised engine