Issue #1603 was partially fixed.
Merge branch 'develop' of github.com:orientechnologies/orientdb into develop