merge 0.2.x (0.2.0 `Javelin`)