PR #7235

PR #7235 is not in the merge queue.