PR #7237

PR #7237 is not in the merge queue.