Add python 2 support on python 3 branch to unify branches