PR #7309

PR #7309 is not in the merge queue.