bugid-99469 | Hubs V2 mobile - fixed from the community