Merge latest changes from VIP branch