Notes

Part of VPU-298