PR #6844

PR #6844 is not in the merge queue.