Merge pull request #7821 from joksnet/patch-1