PR #7058

PR #7058 is not in the merge queue.