Merge branch 'topic/jack' into for-linus