Update to version v2.3.7
Merge branch 'release/2.3.7' into develop