PR #6930

PR #6930 is not in the merge queue.