Changes for HTML editor upgrade

STUD-1428