Notes

Part of VPU-328