CMS-4678 Media Types - ImageUploader fails after calling updateMedia
Some improvements.