1.8.0
Merge branch 'master' into feature/replication