Merge "Use provided context directly" into nyc-dev