VPU-417

Part of VPU-417