Notes

Part of VPU-437