merge 0.39.4