build: fix for finding and handling ICE 3.5 or 3.4
Merge branch 'maint'
Merge branch 'master' into next