develop: Merge branch 'fix/SettableZForSkipSurfaceFind' into develop
develop: Merge branch 'fix/SettableZForSkipSurfaceFind' into develop

davidackerman/fetchUpgrades,davidackerman/fetchUpgrades,davidackerman/fetchUpgrades