Merge changes from v3.9-0 rc1
145 files changed