Merge "Update the owner file for recovery"