Merge pull request #22932 from arjantijms/component_versions

#22931 Update components to more recent versions