Merge branch 'release/v1.5.0-pre'
Bump version
Merge branch 'hotfix/v1.5.0-pre' into develop