Restore Cycles (#12783) - Basecamp