PR #7014

PR #7014 is not in the merge queue.