VPU-018

Part of VPU-018