Fix assist and -> and_then parameter
#21239
Merged
Loading
and -> and_then parameter
#21239