master revert-10682-master update-owners