Initial commit for incident #19415