Notes

Part of VPU-497