Notes

Part of VPU-266