Sync fixes from !77601 in main to 24.0

Chad Stephen Lantzrequested to merge
clantz/athena:24.0-ZDC_GeoM-Sync-with-25.0 into 24.0

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

Merge request reports