case-3469 - Various fixes
case-3469 - hotfix
Merge branch 'case-3469' into development