By adeutscher Closes #17019 (cherry picked from commit b641d7ba251c540a93e8989c02013a5f97bc5c99)
hotfixes