Notes

Part of VPU-278