Merge pull request #1900 from esdrubal/cyclic-ref