PR #7147

PR #7147 is not in the merge queue.