Merge "Remove unused message 'dberr-header'"