PR #7140

PR #7140 is not in the merge queue.