1.3.7-2
Merge branch 'release/1.3.7-2' into develop