For issue #20936
