Merge "Update to release version"