Merge pull request #20204 from Developer-Ecosystem-Engineering:improve-sift