Notes

Part of VPU-428