Notes

Part of VPU-348