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