Merge branch 'topic/caiaq' into for-linus