1.21.0

Closed Nov 28, 2018 100% complete