Notes

Part of VPU-461