Merging the 2.5.1 stable changes back to master