Merge tag 'v1.5.0'

1.5.0
1.5.1
Merge branch 'release/1.5.1' into production