Release 21

Closed Sep 25, 2016 100% complete