PR #8187

PR #8187 is not in the merge queue.