[DF-5048] minor refactoring of code.
Merge branch 'development' of https://github.com/dava/dava.framework into development