By @Saben65 and @velinath Closes #16215 (cherry picked from commit 70868ceee781e6b73da6ec8de4e48ae8fe709242)
hotfixes