PR #7315

PR #7315 is not in the merge queue.