Merge main into feat/korean-localization