v8.31

Closed Nov 28, 2017 100% complete