Merge pull request #18183 from colemanw/versionCheck