Merge branch 'development' into case-3967
case 3967 - Apply patch.
Merge branch 'case-3967' into development