PR #6934

PR #6934 is not in the merge queue.