Merge changes Ifc3271f6,I7d9159e7

* changes:
  Merge branch 'stable-2.9'
  Update replication plugin to latest revision