Notes

Part of VPU-536