Notes

Part of VPR-388