VPU-198

Part of VPU-198