PR #7049

PR #7049 is not in the merge queue.