Release 25

Closed Nov 9, 2016 100% complete