Merge pull request #13986 from seamuslee001/coder_upgrade_uf_tag_sms