PR #7120

PR #7120 is not in the merge queue.