manually merge 2.x into 2.6