Release 36

Closed Apr 13, 2017 100% complete