VPU-425

Part of VPU-425