Notes

Part of VPU-187