merge 0.5.x into 0.6.x