Notes

Part of VPU-479