PR #7355

PR #7355 is not in the merge queue.