VPR-218

Part of VPR-218