PR #8111

PR #8111 is not in the merge queue.