Resolve "prefer kyua over aft-run"

Merged Mark Andrews requested to merge 688-prefer-kyua-over-aft-run-v9_12 into v9_12

Merge request reports