Merge branch 'release/1.3.7' into production
Merge tag 'v1.3.7'

1.3.7