fixing merge for 2.5 master