Pre merge tag 2.5.0 to master