Mockup replication

Merging the base of mockup-replicated with master