Notes

Part of VPU-472