Notes

Part of VPU-527