PR #7204

PR #7204 is not in the merge queue.