PR #8285

PR #8285 is not in the merge queue.