[z2680][z2681] FIX quset 2118 2904 from scriptdev2/scriptdev2-classic

Thinks SD2!