Update to version 1.3.7
Merge branch 'release/v1.3.7' into develop