merge 0.4.x (0.4.2 `Bistre Ink`)