Merge branch 'uc-logic' into for-linus