Merge pull request #7432 from pgavlin/gh6920