refix hydrate user with channels
Merge branch 'design' into develop