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