Updated docs
Merge branch 'release/0.25.1' into develop