Notes

Part of VPU-389