changes just for vega (wanted on both 75 and master)