PR #8028

PR #8028 is not in the merge queue.