Notes

Part of VPU-282