VPU-325

Part of VPU-325