Update to version v2.3.8
Merge branch 'release/2.3.8' into develop