PR #7199

PR #7199 is not in the merge queue.