PR #7037

PR #7037 is not in the merge queue.