Merge branch 'sb/merge-recursive-code-cleanup'