PR #7331

PR #7331 is not in the merge queue.