Revert "Merge remote-tracking branch 'origin/devel/mapSuggestion' into devel/mergeTest"

This reverts commit 4e20eea67ce1d89936bde17ae79f88443a57c1da, reversing
changes made to bba924f4619bc93f732021a2089034e657b027e4.