Merge "Re-make showmap host supported"