PR #7304

PR #7304 is not in the merge queue.