Merge pull request #10048 from dimitri-nicolo/pick-calient-8853-into-opensource-master