merge 0.4.x (0.4.3 `Amazon Forest`)