Notes

Part of VPU-529