Merge branch 'case-3959' into develop
case-3959 - Small fix for UI