Notes

Part of VPU-188