PR #7231

PR #7231 is not in the merge queue.