[DF-32] Fix: minor fixes
Merge branch 'development' of github.com:dava/dava.framework into development