PR #6893

PR #6893 is not in the merge queue.