Upgrade and BC compatibility fix for menu rendering.
Backward Compatibility fix for TinyMce editing.