Comments for #16361 by