Notes

Part of VPU-467