merge 0.1.x (0.1.7 `Poacher`)