PR #7255

PR #7255 is not in the merge queue.