Notes

Part of VPU-446