Add g-s 3.14 support