[fixes #58876266] Fix cancelled cherrypicking requests