[DF-185] Fixed merge issue
Merge branch 'development' of https://github.com/dava/dava.framework into development