PR #7043

PR #7043 is not in the merge queue.