Fix the merge conflict with the merge of the fix for bug #4381 (commit e776f36)