Notes

Part of VPU-498