PR #7141

PR #7141 is not in the merge queue.