PR #7047

PR #7047 is not in the merge queue.