Notes

Part of VPU-474