Merge pull request #5976 from SpEcHiDe/patch-1