Changed the from email
Updated docs
Merge branch 'release/0.25.2' into develop