VPU-408

Part of VPU-408