Take into account collection id for replay prefix
Take into account collection id for replay prefix
Merge branch 'ari-3858' into upstream-ait-qa