PR #7028

PR #7028 is not in the merge queue.