Fixed bug #10289: Pre-Cleanup for integration of a mass uploader