PR #6520

PR #6520 is not in the merge queue.