Update to version v2.3.4
Merge branch 'release/2.3.4' into develop