PR #7247

PR #7247 is not in the merge queue.