Merge pull request #6661 from andibraeu/patch-1