PR #6925

PR #6925 is not in the merge queue.