[DF-4398] After review various fixes
[DF-185] Fixed crash
[DF-185] Fixed missing code
Merge branch 'development_dlc' of https://github.com/dava/dava.framework into development_dlc