Fix maps
Merge branch 'fix_maps' into 44/manage_tasks