VPU-391

Part of VPU-391