Merge "Fixed context reference." into nyc-dev