PR #6819

PR #6819 is not in the merge queue.