Remove some circular references
Merge pull request #964 from romainneutron/circular-refs-1

[3.9] Remove some circular references