PR #7186

PR #7186 is not in the merge queue.