Notes

Part of VPU-336