Merge branch 'experimental' - Improved stability and thread safety of ZookeeperRegistry