VPR-237

Part of VPR-237