Stamping upgrade scripts for Vandelay default match set, with minor adjustments