Merge "Stop using a several deprecated methods/constants." into nyc-support-24.1-dev