PR #7284

PR #7284 is not in the merge queue.