Merge upload and security permissions changes