Merge pull request #1532 from ariard/2022-06-scaleup-far-away