PR #7060

PR #7060 is not in the merge queue.