Notes

Part of VPU-535