Some JoinManager cleanup
Merge origin/master