VPU-358

Part of VPU-358