merge 0.1.x (0.1.8 `Quillback`)