Merge branch 'stable-3.10' * origin/stable-3.10: Link replication plugin Change-Id: I947b08d8478b10df436d8938d08ad5a89ba3931e