PR #7388

PR #7388 is not in the merge queue.