Notes

Part of VPU-363