Merge pull request #6471 from BKPepe/master