merge 0.2.x (0.2.6 `Heat Wave`)