PR #7341

PR #7341 is not in the merge queue.