Notes

Part of VPU-384