PR #7420

PR #7420 is not in the merge queue.