VPU-394

Part of VPU-394