Merge branch 'master', remote-tracking branch 'upstream/master'
ZK-2289: Futher optimize zkbind memory consumption.