Notes

Part of VPU-364