Notes

Part of VPR-389