Notes

Part of VPU-489