PR #7225

PR #7225 is not in the merge queue.