Notes

Part of VPU-379