Sweeping !21169 from master to 21.3. fix ATR-17871Closes ATR-17871

Atlas Nightlybuildrequested to merge
cherry-pick-f406cef875-21.3 into 21.3

fix ATR-17871

Closes ATR-17871

See merge request !21169 (merged)

Merge request reports