Notes

Part of VPU-289