Merge "DO NOT MERGE Fix a few remaining compilation issues" into nyc-support-25.1-dev