Merge branch 'hotfix/0.93.8-6'
Merge branch 'hotfix/0.93.8-7' into develop