Merge branch 'topic/line6' into for-next