sync with latest refactoring of vbus