VPU-357

Part of VPU-357