alpha

Due by September 30, 2018 18% complete

Integrate 1.x versions.