PR #7264

PR #7264 is not in the merge queue.