fixed hubs api
Merge branch 'bugid-98999' into consumer-sprint32-bugid-51353