TK-118172 Updated ReplicatedDatastore and related classes