Merge "More transition fixes" into nyc-dev