Merge "Persist bugreport mapping in a file" into main