Merge "Handle update-ownership tag"