PR #7110

PR #7110 is not in the merge queue.