Notes

Part of VPU-524