merge from 2.8 branch about name mistake