2.5.10

Closed Feb 23, 2018 100% complete