VPU-218

Part of VPU-218