PR #7059

PR #7059 is not in the merge queue.