Notes

Part of VPU-183