Notes

Part of VPU-421