VPR-234

Part of VPR-234