Notes

Part of VPU-534