Merge latest VIP changes