[UPDATE] Bump to 2.5.1
Merge branch 'release/2.5.1' into develop