Release 50

Closed Dec 13, 2017 100% complete