Feature/lvoui 23 map

Fixed  conflicts with master