backport runner fixes to 3-2-stable

Backport cc7dd66 and c0ba0f0, which fix the runner loading issue from issue #7683