DF-1840 fixed for box, fixed for non zero position
Merge branch 'development' of https://github.com/dava/dava.framework into development