Merge branch 'hotfix/0.93.9-1'
Merge branch 'hotfix/0.93.9-1' into develop