Remove GS option (GS is removed on 17.0)
Merge branch 'master' into dev