PR #7031

PR #7031 is not in the merge queue.