Merge "SmartSelection ConfigUpdater: Ignore version numbers" into oc-dev