VPU-326

Part of VPU-326