merge jz node container.cc
Merge branch 'master' into jz