fixed merge for 2.5 for #3442