3.5-rc-3 version bump
Merge branch 'release/3.5' into develop