merge from python2 branch