PR #7369

PR #7369 is not in the merge queue.