PR #7302

PR #7302 is not in the merge queue.