Fix issue with multi-instance loading
Prepare v0.10.1
Merge branch 'master' into master-dldi

* master:
  Prepare v0.10.1
  Fix issue with multi-instance loading