manually merge develop-xhub