Notes

Part of VPU-184