PR #7357

PR #7357 is not in the merge queue.