Merge "Revert "rename to GEAR_PARK"" into nyc-dev