Merge branch 'topic/api_caps' into for-linus