Merge branch 'topic/ice1724-pm' into for-linus