The attached should be fixing it, could you give it a try?

Circular objects are rare in code and we lived with this for a long
time, I'd suggest to install this only on master not to touch the
release branch.  Eli WDYT?

Thanks

  Andrea