Merge branch 'case-3973' into development
case-3973 - Z-index fixes