Merge "Allow same version update." into sc-dev