Empty hub read error fix.
Merge branch 'master' into dev

* master:
  Empty hub read error fix.