Merge "Fix kill stuck jobs pipeline"