Notes

Part of VPU-388