Notes

Part of VPU-532