Sync fixes from !77601 in main to 24.0
Manual sync of 24.0 with 25.0 after manually sweeping (!77601 (merged)) changes from !76392 (merged) into main.
Manual sync of 24.0 with 25.0 after manually sweeping (!77601 (merged)) changes from !76392 (merged) into main.