Notes

Part of VPU-267