Merge "update glgen to take into account recent changes"