Release 22

Closed Oct 5, 2016 100% complete