PR #8169

PR #8169 is not in the merge queue.