Merge pull request #311225 from r-ryantm/auto-update/kor