Notes

Part of VPU-171