PR #7310

PR #7310 is not in the merge queue.