Sweeping !40073 from 21.0 to master. Fix distance computation bug in FCS extrapolator

Atlas Nightlybuildrequested to merge
cherry-pick-6a8af43ef3e-master into master

Fix distance computation bug in FCS extrapolator

See merge request !40073 (merged)

Merge request reports