Merge for issue #20488