Add cherry-pick for different-colored-runs bug