This is the merge for Building and Waterways support, IMPORTANT: NO, Heightmap support in this branch