Notes

Part of VPU-477