Updates #13707 Code is welcome to fix the remaining core errors. (cherry picked from commit d37f52c93e000c581ea21089a87fbafd2c192349)