PR #7051

PR #7051 is not in the merge queue.