Fix conflicts with the merge of the first commit of the bug fix #4732
Fix conflicts with the merge of the second commit of the bug fix #4732