Release 1.2.5
Merge branch 'release/1.2.5'
Merge tag '1.2.5' into develop

1.2.5