cont work on joins for review
Merge remote-tracking branch 'origin/peer_review' into peer_review
config cleanup