Notes

Part of VPU-385