Merge "Allow patrol of uploads"