Notes

Part of VPU-494