Gav Wood authored Sep 12, 2018 and Arkadiy Paronyan committed Sep 12, 2018

* Fixups for 646

* Fixes for API

* For for #678

* Fix runtime

* Update and build

* Tests build

* Fix tests