fixed merge #4468