Merge pull request #5462 from hedii/hedii-patch-1