Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'