PR #6861

PR #6861 is not in the merge queue.