Notes

Part of VPU-169