Fixes to make instance reusable
Merge branch 'master' into hack/with-binary-libraries

* master:
  Fixes to make instance reusable