Merge pull request #22972 from alalek:update_version_4.7.0-pre