Merge branch 'hotfix/3.8.1'
Merge branch 'release/3.9.0'
Merge remote-tracking branch 'upstream/master' into develop