Merge branch 'accelerate-distance-marginalization-lookup' into 'master'

Make building distance marginalization lookup table faster

See merge request !957