To include changes to the regex and line names to fix the issue reported here: !4508 (comment 9363557).
Cc @fibishop @mtat @desahoo