Merge with v3.9-0-rc2 first pass
104 files changed