Vat merge

Merge Nitro Code to Master