Merge "Fix some edge cases" into nyc-dev