[DF-3075] Fixes according to review
[DF-3075] Fixes according to review
[DF-3075] Fixes according to review
[DF-3075] Fixes according to review
Merge branch 'feature-new-lighting' of github.com:dava/dava.framework into feature-new-lighting