Notes

Part of VPU-148