3.4-rc-2 version bump
Merge branch 'release/3.4' into develop