Merge tag '3.4.0' into develop

3.4.0
Fix test