Closes #19750 Closes #28643 Closes #30115 Signed-off-by: Jon Koops <jonkoops@gmail.com> (cherry picked from commit c7361ccf6e3079dffd72e191e839822b3309c446)