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