Merge "VPP version update" into stable/colorado