Merge branch 'topic/uapi-fix' into for-next