Closes #21101 Closes #21099 (cherry picked from commit fe97d96abc9df65417e76b1054f71763f7fcf06c)
updates