Merge branch 'py3' features 8029 8030