File replication now follows 2/3
Merge branch 'fix-replication' into dev