Merge branch 'feature/runner-detection' into development

* feature/runner-detection: add runner detection