Merge pull request #6104 from dhewg/6g