PR #7160

PR #7160 is not in the merge queue.