merge 0.2.x (0.2.5 `Blooming Daffodil`)