Notes

Part of VPU-279