PR #7133

PR #7133 is not in the merge queue.