Merge branch 'nd/icase'