Author: @joschiwald Closes #15080 (cherry picked from commit 6fedea54ef3f1c678f0869807ac38b1db72351fd)
hotfixes