Notes

Part of VPU-538