Merge branch 'en/merge-recursive-icase-removal'