PR #7368

PR #7368 is not in the merge queue.