#3422 merge for 2.5