Gs 2.4.x back port

issue #121