[python3] merge master