PR #7128

PR #7128 is not in the merge queue.