closes #15044 - by @robinsch (cherry picked from commit dc1a015d0b48f8684aa4174b9b84eba910467a48)
hotfixes