merge 0.3.x (0.3.4 `Flaming Volcano`)