[DF-5514] Fixes after review
[DF-185] fix projects
Merge branch 'development' into wotg_merge_final