PR #6912

PR #6912 is not in the merge queue.