PR #7164

PR #7164 is not in the merge queue.