Build #816:   Merge 0093b5f93efe67f81a0485111883514c6acd12d1 into 3e3796e8ae349d17a473e519ac61c90ef48... on branch seq_and_line about 4 years ago