Merge branch 'release/0.0.24' into develop

* release/0.0.24:
  update
update
Merge branch 'release/0.0.25'

* release/0.0.25:
  update