2.10.4

Closed Oct 27, 2017 100% complete