Notes

Part of VPU-548