2.3.6

Closed Aug 27, 2018 100% complete