PR #7261

PR #7261 is not in the merge queue.