PR #7171

PR #7171 is not in the merge queue.