improve user_line
Merge branch 'user_line_13.24'