Notes

Part of VPU-495