PR #7177

PR #7177 is not in the merge queue.