PR #7048

PR #7048 is not in the merge queue.