Release 37

Closed Apr 26, 2017 100% complete