PR #7188

PR #7188 is not in the merge queue.