Merge pull request #15328 from ja-pa/atlas-probe-v2