PR #7042

PR #7042 is not in the merge queue.