Sweeping !53620 from master to 22.0. Fix ART for photons

Fix ART for photons

See merge request !53620 (merged)

Merge request reports

Loading