Closes #22171 (cherry picked from commit 0fe94ca588fa819dce03a7d25433f14d4b1b370c) (cherry picked from commit bddc43bc3538c3959e7d6fb3e057ef20a9da8816)
Closes #22171 (cherry picked from commit 0fe94ca588fa819dce03a7d25433f14d4b1b370c) (cherry picked from commit bddc43bc3538c3959e7d6fb3e057ef20a9da8816)