PR #7364

PR #7364 is not in the merge queue.