2.5.0
Merge branch 'next'