PR #7138

PR #7138 is not in the merge queue.