Merge "showmap enhancements"