Cherry pick of MCAgls fix

Mark Smithrequested to merge
masmith-master-patch-27537 into master

FYI @pkoppenb . Feel free to close this if you don't want it for Run 3. Cherry pick of !3550 (merged)

Edited by Mark Smith

Merge request reports