#issue 146 - initial fix High-Replication Datastore problem
Merge branch 'develop' into issue/134