merge 0.40.0