VPU-394b

Part of VPU-394