1019909 - Added replica set support