Merge branch 'sb/merge-recursive-copy-paste-fix'