CON-1074 | Zindex change fix