#CEXT 287
#CEXT 287
fix
fix editor
Merge remote-tracking branch 'remotes/origin/v1.0-dev-foooon' into v1.0-dev-Emil
fix
#CEXT-274 #fixed
ver