Notes

Part of VPU-478