Merge "Back-port ag/2491664" into nyc-dev