Notes

Part of VPU-419