Closes #21070 Closes #21069 (cherry picked from commit 99cc4bb525abee4007d2313526226abfe641cba2)
updates