Merge pull request #19021 from borkra/fix_dependencies