Gs 2.4.x back port