PR #6846

PR #6846 is not in the merge queue.