Notes

Part of VPU-248