PR #7345

PR #7345 is not in the merge queue.