PR #7065

PR #7065 is not in the merge queue.