2.5.17

Closed Sep 27, 2018 100% complete