Submap handling

Merged Piotr Gawron requested to merge submap-handling into master

Merge request reports