Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev