Merge branch 'feature/hellthread-mitigation' into 'develop'