[DF-185] Fixed merge issu
Merge remote-tracking branch 'dava/development' into DDevelopment