updates from submodules
Merge branch 'inEditor'

* inEditor:
  updates from submodules