PR #7067

PR #7067 is not in the merge queue.