ReplicaSet support (into develop)

"Twin" PR of #496