CORE-4999: Corrected tree editor visibility sub-editor.
Merge branch 'master' into STABLE