fixed merge for 2.5 #3119