PR #7187

PR #7187 is not in the merge queue.