Fixed bug #12680: final adjustments to MediaCE