PR #7020

PR #7020 is not in the merge queue.