Fix Klobys and restore VGP
Merge with master