Notes

Part of VPU-429