Notes

Part of VPU-338