Merge branch 'topic/jack' into for-2.6.35