Notes

Part of VPU-186