finish all checks on join
Merge branch 'improve_join2' into develop