Merge "Don't pay for filename/line number lookup unless you need to." into ics-mr1