Merge branch 'topic/ice' into for-linus