Sweeping !39493 from master to 21.6. Fix compiler warning from qualifier in static_cast

Atlas Nightlybuildrequested to merge
cherry-pick-cd3ca8252a1-21.6 into 21.6

Fix compiler warning from qualifier in static_cast

See merge request !39493 (merged)

Merge request reports