Merge "fix docs" into nyc-dev