Backported context management in test cases
Merge branch 'dev'
Updated readme
Updated readme
Merge branch 'dev' into py3