PR #7314

PR #7314 is not in the merge queue.