Merge pull request #24071 from AndyAyersMS/Fix24055