PR #7185

PR #7185 is not in the merge queue.