Merge "Ensure cleanup is called for the file pushed"