[6.12.z] Bring back changes reverted by #11544#13535

Merged

Griffin-Sullivan merged 1 commit intoSatelliteQE:6.12.zfrom vsedmik:6.12.z-iss-fix-reverted-changes

Dec 21, 2023

+1-68

Commits on Dec 20, 2023

Bring back changes reverted by SatelliteQE#11544
vsedmik
committed