Tests for #20895