Merge "inspector py3 gate fix"