PR #6787

PR #6787 is not in the merge queue.