Notes

Part of VPU-482