Notes

Part of VPU-417