[Other] Update from Xmanager team