PR #7146

PR #7146 is not in the merge queue.