Notes

Part of VPU-537