Notes

Part of VPU-493