Notes

Part of VPU-339