Notes

Part of VPU-179