Notes

Part of VPU-518