Replication related API update - WIP
Merge pull request #210 from tbak/2.x

Replication related API update - WIP