Added join flow.
Merge in master