PR #6890

PR #6890 is not in the merge queue.