Merge from 10.4.4.25 to 10.6.1.14.4