PR #6896

PR #6896 is not in the merge queue.