PR #7312

PR #7312 is not in the merge queue.