Merge branch 'geni-v3' into pep8