Release 2.3.4
Merge branch 'release/v2_3_4' into dev