Apply a bug fix
Merge branch 'release/1.0.1' into develop

* release/1.0.1:
  Apply a bug fix