merge 0.2.x (0.2.8 `Navy Blue`)