Rebased to sosik/master + fixed schemaEditor.