Vega specific code merged from release/75

Just the one this time I hope