Merge "GUS 2018: Multi-master and multi-site"