Manual Merge UI updates
Merge branch 'replication'