VPU-314

Part of VPU-314