Merge latest VVV changes