Backport cyclic variable fix

Description

This is a backport of !712 (merged) for #600 (closed).

This merge request, when approved, will close issue/bug: #600 (closed)

---