PR #7057

PR #7057 is not in the merge queue.