PR #7046

PR #7046 is not in the merge queue.