Notes

Part of VPU-476