Merge branch 'release/1.25' into develop
Fix typo leading to unassigned variable
Prep for release
Merge branch 'release/1.2.5.1'