[DF-1958] fix for crash when rendering landscape
Merge branch 'origin/development-qa'