VPR-236

Part of VPR-236