Merge branch 'py26-tests' into dt-test
Merge branch '27143-role-fix' into dt-test