Merge branch 'case-3976' into develop