Applied ZOOKEEPER-1657
Applied ZOOKEEPER-1657