PR #7311

PR #7311 is not in the merge queue.