Improve twinnable manymany join(), add main_context condition
Merge branch 'feature/twinnable_manymany' into master/chiba2
Merge branch 'master/chiba2' into master/dubrovka