Merge pull request #5800 from WassimAttar/patch-1