Merging commit from 2.5