Merge the version 3.4.0 changes