Merge branch 'nd/icase' into maint