Merge "Add process name to error id." into sc-dev