Merge branch 'hotfix/3.9.4'
Merge branch 'release/3.9.5'
edits