BC-1777 MongoDB repository enhancements
Merge remote-tracking branch 'origin/2.1.x'