Notes

Part of VPU-475