Notes

Part of VPU-471