Notes

Part of VPU-539