Notes

Part of VPU-347