Merge pull request #1542 from ViktorTigerstrom/2022-06-prepare-maps-for-channels...