0.18 release
Merge 0.18 changes