Merge branch 'master' into fix/apply-zookeeper-finalization-deferred-logging