Release 38

Closed May 23, 2017 100% complete