UPDATE: for editor under Svetlin sandbox
Merge remote-tracking branch 'origin/master'