Update with v2.5.1 changes