Notes

Part of VPU-263