Merge branch 'release/1.3.8' into production
Merge tag 'v1.3.8'

1.3.8