all updates fixing bugs in #19711