Notes

Part of VPU-173