Merge branch 'hotfix/v1.2.5'
Merge branch 'master' into develop