Notes

Part of VPU-337