1

Implemented the recursion prevention mechanic from upstream