benesch Merge pull request #19287 from benesch/1.1-dont-panic …