Notes

Part of VPU-439