PR #7159

PR #7159 is not in the merge queue.