Notes

Part of VPU-488