Merge "fix failing garage mode test" into nyc-dev