3.4.2
Merge branch 'release/3.4.2' into develop
future version