2.5.18

Closed Nov 7, 2018 100% complete