Notes

Part of VPU-447