Merge branch 'topic/univ_api' into for-linus