PR #6847

PR #6847 is not in the merge queue.