Stop cycles by code

RH-42000 is fixed in the latest Service Release Candidate