Release 23

Closed Oct 19, 2016 100% complete