Release 35

Closed Apr 2, 2017 100% complete