Notes

Part of VPU-286