CORE-4806
CORE-4806: Correcting tree editor