Merge branch 'jc/deprecate-recursive'