Merge pull request #6692 from softmetz/softmetz-patch-1