Release 24

Closed Nov 1, 2016 100% complete