Merge "Update the version"