PR #7151

PR #7151 is not in the merge queue.