PR #7016

PR #7016 is not in the merge queue.