[python3] merge master and some cleanup