PR #7216

PR #7216 is not in the merge queue.