Update to version v2.3.9
Merge branch 'release/2.3.9' into develop