PR #7096

PR #7096 is not in the merge queue.