chirp py3 branch

Patch for issue #10001