PR #7239

PR #7239 is not in the merge queue.