Merge "Add swapPSS support to showmap"