VPU-328

Part of VPU-328