Zehiro/kresus circular references
This is just a rebase and update of !521 (closed). @ZeHiro, care to have a look please? (the commit message indicates what's changed here)
This is just a rebase and update of !521 (closed). @ZeHiro, care to have a look please? (the commit message indicates what's changed here)