Notes

Part of VPU-264