PR #7346

PR #7346 is not in the merge queue.