bugs of join and profile
Merge branch 'dev'