#94984 map loading and other improvements