Notes

Part of VPU-276