Merge branch 'release/v0.11.4' into develop

* release/v0.11.4:
  v0.11.4
Merge branch 'develop'

* develop: