merged latest master, #18069