Fixed bugs for Editor
fixed bugs
Merge pull request #6052 from pipu/develop_pipu_fixedbugsforeditor_1301

Fixed bugs for Editor