PR #6895

PR #6895 is not in the merge queue.