PR #7070

PR #7070 is not in the merge queue.