VPU-387

Part of VPU-387