Notes

Part of VPU-422