Merge tag '1.2.5' into develop

Release v1.2.5
Current work checkpoint. See diff for details.
Composer dependencies updated.
rp
Merge branch 'release/1.2.6'