Notes

Part of VPU-284