Notes

Part of VPU-459